Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 6 Jul 2010 22:53:26 +0000 (22:53 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 6 Jul 2010 22:53:26 +0000 (22:53 +0000)

Trivial merge